From 32b410c77b3789c7146d63bb77e8d336d293cc53 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Mon, 14 Mar 2016 19:19:43 +0100 Subject: [PATCH] Adwaita: more drag hilight fixes --- gtk/theme/Adwaita/_common.scss | 13 +++++++------ gtk/theme/Adwaita/gtk-contained-dark.css | 8 ++------ gtk/theme/Adwaita/gtk-contained.css | 8 ++------ 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 5c521dfc7f..4fd6dd1ab9 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -189,11 +189,12 @@ textview { // This will get overridden by .view, needed by gedit line numbers &:backdrop { background-color: mix($backdrop_bg_color, $backdrop_base_color, 50%); } - &:drop(active) { - &, & > text { box-shadow: none; } + // &:drop(active) { + // &, & > text { box-shadow: none; } + // + // > text { background-color: transparentize($drop_target_color, 0.9); } + // } - > text { background-color: transparentize($drop_target_color, 0.9); } - } } %osd, .osd { @@ -4159,8 +4160,8 @@ button.circular { // FIXME: aggregate to buttons *:drop(active):focus, *:drop(active) { // FIXME needs to be done widget by widget, this wildcard should really die - border-color: black; - box-shadow: inset 0 0 0 1px black; + border-color: $drop_target_color; + box-shadow: inset 0 0 0 1px $drop_target_color; } stackswitcher button.text-button { min-width: 100px; } // FIXME aggregate with buttons diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 1b8c765de1..b80b3707b4 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -119,10 +119,6 @@ textview { background-color: #313434; } textview:backdrop { background-color: #333636; } - textview:drop(active), textview:drop(active) > text { - box-shadow: none; } - textview:drop(active) > text { - background-color: rgba(78, 154, 6, 0.1); } popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification, .app-notification.frame, .osd .scale-popup, .osd { @@ -4159,8 +4155,8 @@ button.circular { *:drop(active):focus, *:drop(active) { - border-color: black; - box-shadow: inset 0 0 0 1px black; } + border-color: #4e9a06; + box-shadow: inset 0 0 0 1px #4e9a06; } stackswitcher button.text-button { min-width: 100px; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 006cf088fa..7a152a277e 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -119,10 +119,6 @@ textview { background-color: #f4f4f3; } textview:backdrop { background-color: #f4f4f3; } - textview:drop(active), textview:drop(active) > text { - box-shadow: none; } - textview:drop(active) > text { - background-color: rgba(78, 154, 6, 0.1); } popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification, .app-notification.frame, .osd .scale-popup, .osd { @@ -4193,8 +4189,8 @@ button.circular { *:drop(active):focus, *:drop(active) { - border-color: black; - box-shadow: inset 0 0 0 1px black; } + border-color: #4e9a06; + box-shadow: inset 0 0 0 1px #4e9a06; } stackswitcher button.text-button { min-width: 100px; } -- 2.30.2